From 97f274fee11be50c39da5bcf4fa3ae32b3e3da8d Mon Sep 17 00:00:00 2001 From: Brian Wolff Date: Mon, 19 Aug 2013 13:17:06 -0300 Subject: [PATCH] Add MP4 to mime.types Its a popular video format, we should recognize its type. This will also prevent people from uploading mp4's to commons. Wikipedia claims m4a sometimes used for video content. RFC 4337 says audio/mp4 is mime type for mp4 with no video (which is usually what an m4a extension means). Bug: 52990 Change-Id: I5c24c3e318651241cced5b36d107d3603a289427 --- includes/mime.info | 2 ++ includes/mime.types | 2 ++ 2 files changed, 4 insertions(+) diff --git a/includes/mime.info b/includes/mime.info index f7576e41cc..a4e8b64b0d 100644 --- a/includes/mime.info +++ b/includes/mime.info @@ -30,6 +30,7 @@ application/x-dia-diagram [DRAWING] audio/mpeg audio/mp3 audio/mpeg3 [AUDIO] +audio/mp4 [AUDIO] audio/wav audio/x-wav audio/wave [AUDIO] audio/midi audio/mid [AUDIO] audio/basic [AUDIO] @@ -46,6 +47,7 @@ video/x-sgi-video [VIDEO] video/x-flv [VIDEO] video/webm [VIDEO] video/x-matroska [VIDEO] +video/mp4 [VIDEO] application/ogg application/x-ogg audio/ogg audio/x-ogg video/ogg video/x-ogg [MULTIMEDIA] diff --git a/includes/mime.types b/includes/mime.types index a89d229a72..378f27497d 100644 --- a/includes/mime.types +++ b/includes/mime.types @@ -118,6 +118,8 @@ text/xml xml xsl xslt rss rdf text/x-setext etx text/x-sawfish jl video/mpeg mpeg mpg mpe +video/mp4 mp4 m4a m4p m4b m4r m4v +audio/mp4 m4a video/ogg ogv ogm ogg video/quicktime qt mov video/vnd.mpegurl mxu -- 2.20.1